autoPatchelfHook: Add dependencies for '.note.dlopen' to rpath #325126
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@layus ping |
philiptaron
approved these changes
Jul 15, 2024
There was a problem hiding this comment.
It's too bad there is no existing place to land a unit test for these changes.
I've run them successfully (along with the rest of the systemd 256.2 patch stack) on my actual machine, and can say that both in theory (such as I understand it) and in practice this change produces a working system.
also retain libc in rpath if it was there originally
ElvishJerricco
force-pushed
the
auto-patchelf-hook-note-dlopen
branch
from
ec9a0bc to
2b13cc2
Compare
|
(updated with a change to a comment's wording, as @layus suggested in the other PR) |
philiptaron
approved these changes
Jul 19, 2024
nikstur
approved these changes
Jul 20, 2024
|
Merged in #307068 |
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
This allows
autoPatchelfHookto resolve.note.dlopendependencies. The main motivation for this is #307068, where we intend to use this hook to automatically add the.note.dlopendependencies of systemd 256 to its rpath. This is a little strange, as systemd is built from source and we haven't historically had to modify its rpath, but this seemed like the most obvious solution.This also slightly changes the handling of libc. Instead of always ignoring libc dependencies, this attempts to retain libc in binaries' rpath if they had it originally.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.